From c6aac36d04480d61c7fc4832403a513449cf6887 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 17 Jul 2019 18:04:02 +0100 Subject: [PATCH] Remove infrastructure for dealing with reftests that are known to fail --- debian/patches/reftest-known-fail.patch | 49 ------------------------- debian/patches/series | 1 - debian/rules | 1 - 3 files changed, 51 deletions(-) delete mode 100644 debian/patches/reftest-known-fail.patch diff --git a/debian/patches/reftest-known-fail.patch b/debian/patches/reftest-known-fail.patch deleted file mode 100644 index 1198141280..0000000000 --- a/debian/patches/reftest-known-fail.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Michael Biebl -Date: Mon, 2 May 2016 01:18:04 +0200 -Subject: Mark known failing tests as non-fatal - -Forwarded: no ---- - testsuite/reftests/gtk-reftest.c | 22 +++++++++++++++++++++- - 1 file changed, 21 insertions(+), 1 deletion(-) - -diff --git a/testsuite/reftests/gtk-reftest.c b/testsuite/reftests/gtk-reftest.c -index b0fb574..8eab767 100644 ---- a/testsuite/reftests/gtk-reftest.c -+++ b/testsuite/reftests/gtk-reftest.c -@@ -264,6 +264,20 @@ save_image (cairo_surface_t *surface, - g_free (filename); - } - -+static gboolean -+known_fail(const char *test_name) -+{ -+ char *filename = get_test_file (test_name, ".ui.known_fail", TRUE); -+ -+ if (filename) -+ { -+ g_free (filename); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - static void - test_ui_file (GFile *file) - { -@@ -296,7 +310,13 @@ test_ui_file (GFile *file) - if (diff_image) - { - save_image (diff_image, ui_file, ".diff.png"); -- g_test_fail (); -+ if (known_fail(ui_file)) -+ { -+ printf("KNOWN FAIL: "); -+ g_test_message ("KNOWN FAIL: %s", ui_file); -+ } -+ else -+ g_test_fail (); - } - - remove_extra_css (provider); diff --git a/debian/patches/series b/debian/patches/series index afdc10e7ce..809c9722c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -reftest-known-fail.patch testsuite-Remove-dangling-references-to-box-packing-tests.patch diff --git a/debian/rules b/debian/rules index de5071ee34..2d15f2d7d5 100755 --- a/debian/rules +++ b/debian/rules @@ -135,7 +135,6 @@ override_dh_clean: debian/control # gross kludge to force control generation with the %.in target touch debian/control.in rm -f $(call dh_subst_files,$(all_binaries)) - rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install dh_clean -- 2.30.2